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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dcd3e898 -s ours am: 0d22d8e6 -s ours am: a0b728a3 -s ours" into rvc-qpr-dev-plus-aosp am: e590279e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I22ce02d259200274ab49167fdd0a7c40976fdd10