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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7eb6cf29 -s ours am: c1be178e -s ours am: 1f77568e -s ours" into rvc-qpr-dev-plus-aosp am: 28b88671 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7f9d478eabc6cc45fc9d82146a1b4aeb81f8a54c