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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dffcd5fe -s ours am: be8cba0f -s ours am: bb15668b -s ours" into rvc-qpr-dev-plus-aosp am: 14712d06 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I479dbd2340c490681f54981079cf67d6e4bcf529