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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9c893d6a -s ours am: 79e2dcac -s ours am: 717ad1d5 -s ours am: 36079465 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifacab4032413a1364440aaea944de66a4e6bebc5