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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0400518f -s ours am: f4d7d9bd -s ours" into rvc-qpr-dev-plus-aosp am: f5e87886 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I156141700c577a0f6a8fa955b188f748c0bbbf0a