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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 96860e0e -s ours am: 40e01beb -s ours am: 2c2d86ce -s ours" into rvc-qpr-dev-plus-aosp am: f44efc81 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I700c2cbe975e2be8168b6ed2111cb15ce9772bae