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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f9b47aa8 -s ours am: 2e88b2b9 -s ours" into rvc-d1-dev-plus-aosp am: b5f493e9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2e634b47a5745d23d6578b9d4f44c2d3a14dd829