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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b2408c5b -s ours am: d2d22dd8 -s ours am: 680afb5b -s ours am: b74957fe -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic3aef31bfe58fdda19a02eec35f501cd31f7907e