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

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

am skip reason: subject contains skip directive

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

Change-Id: Id3fbbed73eae43486075fd85572d7d793b32524e