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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51ae4ade -s ours am: 06d1b3a5 -s ours" into rvc-d1-dev-plus-aosp am: fb7b1afa -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6c5356348622441f4789077020213db91912c0c0