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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 96ad83f9 -s ours am: 41a31994 -s ours am: ff44ec80 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic972532a13a302743e89df866acc33f5563f2177