[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 954eb7fc09 -s ours am: dc155267db -s ours

am skip reason: Merged-In I53efd9739140b46f9980ea49411bc7099b19493d with SHA-1 19d73b8963 is already in history

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

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