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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c4c8e17c -s ours am: 17e5b654 -s ours am: 3a1f81ed -s ours" into rvc-qpr-dev-plus-aosp am: 06aa1945 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9d371860002988abdff25ae0c20de2f21632d116