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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a2e6eb44 -s ours" into sc-v2-dev-plus-aosp am: ce9b82f3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I86f46f1a7cb64f0307842da1bccc455973b93316