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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8cde2b1a -s ours am: b1e4db18 -s ours" into rvc-d1-dev-plus-aosp am: 81d04918 -s ours am: 034350f3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7d31404a916ecc23732cb3f67447cc92a7e358d6