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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fbfd4edc -s ours" into sc-mainline-prod am: ec4ce5cf -s ours

am skip reason: subject contains skip directive

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

Change-Id: I58cedc89fadd565f61a56edc823b5fc7ba112e12