Merge "Merge TQ1A.221205.012" into stage-aosp-master am: 75628b7ddc

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

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