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

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

am skip reason: subject contains skip directive

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

Change-Id: I648ce417929cccb6eb6b9e533ea5638b72b49a18