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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f192f44 -s ours am: b30a1434 -s ours am: 4f2fb706 -s ours" into rvc-d1-dev-plus-aosp am: c9bf4248 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I83fd17adfe55d738bdb82e696327d555a6008ab0