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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 570c6a4e -s ours am: 70018d69 -s ours am: 2552d9df -s ours" into rvc-qpr-dev-plus-aosp am: 02ad0851 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I72ee8db41382d40107ec9f8092166276426b63e1