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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 177e7321 -s ours am: df74ed8f -s ours" into sc-qpr1-dev-plus-aosp am: b708b2ad -s ours am: c9f715b2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68b627eb76b2bce79e25158358afd0b38f335b8b