[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 2506fb1492 -s ours am: 307a2777b8 -s ours

am skip reason: Change-Id Ibb6bcd5f3bf95540c39fa328a274886dae323c19 with SHA-1 100aebd3e6 is in history

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

Change-Id: I737b9fc78ffc8701f3b80c6dddd1fe69fc158190