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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 570c6a4e -s ours am: 70018d69 -s ours am: 0b958c5e -s ours" into rvc-qpr-dev-plus-aosp am: ebfbaee2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7d8e0431b39220a455a8f072d912c1cae63821c9