[automerger skipped] Merge changes from topic "presubmit-am-319ef745e4a34d1597f2c65ab319049d" into sc-qpr1-dev am: 3cb4530a3b -s ours am: 71d080d140 -s ours am: ca94858495 -s ours

am skip reason: Merged-In Id9c98fc08876656e1f48d12823a24bb7a44bee45 with SHA-1 c2380d94c6 is already in history

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

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