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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6b223ea5 -s ours am: e7cd22f6 -s ours am: 725c2609 -s ours am: f6a5d2fb -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia53485b009e65b06ebc9bb44cbb32574e65f4199