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" into rvc-d1-dev-plus-aosp am: 9d3bd149 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id1121a62c691c941dd6d953d48d9a5e88754a0a6