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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0421f6c6 -s ours am: 94a0cf2a -s ours" into sc-qpr1-dev-plus-aosp am: a2381a09 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iaa6c8ccfea9e580bc2df4a4ce03681995175ec8b