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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 80e43d2e -s ours am: 617c70f0 -s ours" into rvc-d1-dev-plus-aosp am: d4006f98 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I98a6dd7823aebd96de713def04ae5dd9fa6fdfce