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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 680e13f2 -s ours am: b242a8a9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idde87ca13f4e33545872c3ee181bcc55cb8bb48e