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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: aaf96024 -s ours am: 031726c2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I36e687f5a37c78a6aa5dbcaac6f78a0676a695a3