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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 96860e0e -s ours am: 41369c7d -s ours" into rvc-d1-dev-plus-aosp am: 888b8037 -s ours am: 317f5a98 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I81b667356c4e34d0999195f5484fcaf7d47159dd