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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 038a340e -s ours am: db2e0a06 -s ours am: 3b2aaa6c -s ours am: 154d9d3a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ied9bfdf23a17c2a4af7c3f888193c287f8e0f1cb