Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into...

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa49 -s ours am: 69c10a41 -s ours am: a44b9c4c -s ours" into rvc-d1-dev-plus-aosp am: 16df259b -s ours am: 77c19165 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I49b887b29e3da3b47923cd658eddd498c0e7838f