[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: d917a132 -s ours am: b0630cf9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iecdbaadb3f7632c8aae6187a783129c6e17f2136