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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 80e43d2e -s ours am: 8a9211ec -s ours" into rvc-d1-dev-plus-aosp am: 9a78c292 -s ours am: ee0600f4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I67550882de0d0dadffb5b6819ebb3d85309ac04d