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

am skip reason: subject contains skip directive

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

Change-Id: I483c1bbc7d7d0f7b24e7ebe3868bcf7e6a8cc8ef