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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ae6bb969 -s ours am: aa9ee473 -s ours" into rvc-d1-dev-plus-aosp am: a23669c5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0a9987e91f4d1d337bd2c6caa4e7c665a64a9e57