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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: b8217996 -s ours" into rvc-d1-dev-plus-aosp am: 875b62e4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I506930ef7457929ba7d11826c80f3ae0d38b915a