[automerger skipped] Merge Android U (ab/10368041) am: 313ff6f63c -s ours

am skip reason: Merged-In I78ca8f4144fccc0b21f153d44b2dde13f7c8433e with SHA-1 6e324dec2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/24182712

Change-Id: I9ca14a9c358af0f687dbef3b18e4fa39a8d03098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>