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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: cd259caf -s ours am: fa42ef82 -s ours am: b3b360a6 -s ours" into rvc-qpr-dev-plus-aosp am: dc8bec39 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I09b35391132771c16efa4788448e1ed97cbc30e7