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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 09ce8952 -s ours am: d0e570a7 -s ours am: e05ca600 -s ours am: 2d8f8919 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id73a27b25be527c2218b155e8b1c5e1f3bf70199