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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a7afeea7 -s ours am: eae2b4db -s ours" into rvc-qpr-dev-plus-aosp am: 78ef9eb1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I31184a701aa95c4139295b5b52a437ac340a98cb