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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 96719a61 -s ours am: 23c7b00c -s ours am: 53719f8b -s ours" into sc-v2-dev-plus-aosp am: 12b48a8a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6d97847a5496595788e894c626fe4cd33a99baba