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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c125d9d4 -s ours am: 5f9e5aa8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I974fcfbf4d2c71dd6b8abd890f2c2b53c9c99092