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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 93e19bed -s ours am: 84a1f729 -s ours" into rvc-d1-dev-plus-aosp am: cf30bb36 -s ours am: f1f7cca2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I52b506f3d184be0d983250e0eff4f9a35640380c