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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9fa2a827 -s ours am: aff6e6d2 -s ours" into rvc-qpr-dev-plus-aosp am: b3c6b4d5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I21900f2daa7a053da322bfe5b0533e9f6c835d5f