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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 06ca6eed -s ours am: ce0d39c0 -s ours am: 9621f1d4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I14f82a9a9d9886115550cb71614208c544b765cb