[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: ded94789 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia8916b75e60c061f5f5855ff8a31f657ae06b1f6