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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 24f4aada -s ours am: b6f342be -s ours" into sc-qpr1-dev-plus-aosp am: c045468c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I85dc8d4ec7ccfb80fbdd8dca337514ff43a0b0b7