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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce0 -s ours am: e9fe9225 -s ours" into rvc-d1-dev-plus-aosp am: 7dcf5038 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I136f0cf75c341e5b8583147678b52288235786da