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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: dfab28ce -s ours am: dfb32661 -s ours" into rvc-qpr-dev-plus-aosp am: c3759ab4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I35344d863ceb188294472e96204910238b63a57b