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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d73fcd72 -s ours am: 76d64e87 -s ours" into sc-qpr1-dev-plus-aosp am: 3b4d857f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I797a6e3611825127927664366243221a131e9a09