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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: bcec292d -s ours am: fb226f58 -s ours" into rvc-d1-dev-plus-aosp am: 31f05766 -s ours am: ec777275 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I11b03a3334691424a76be01f74ad9f9e970cd95c