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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: aa45eeb1 -s ours am: b9a0fe5c -s ours am: 46e3e23f -s ours am: 25f23cd2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2700b215d9043c40568f9a5832eb7506dc0bdd1b