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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3c26551d -s ours am: 94f60453 -s ours am: c2d85b82 -s ours" into rvc-qpr-dev-plus-aosp am: 77fb8389 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I65d56bf05aaeaa6c5a68650dac631c44888e4fb6