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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 08919ffc -s ours am: 660e493a -s ours" into rvc-qpr-dev-plus-aosp am: 844cb386 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id76755fdca94ccc3cb362ad05ac4cf8fbfd5a5f6