Merge "[automerger skipped] Merge Android 13 QPR1 am: ffc2592f4f -s ours" into stage-aosp-master am: 997fb5c652 -s ours

am skip reason: Merged-In If4cf0f0e773371430539cde914bcc761b26acf7e with SHA-1 35a6ffe9a6 is already in history

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

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