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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2415a31c -s ours am: 3e1acd86 -s ours am: 7ca8a78d -s ours am: 55e14fcc -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8c3ddf67ed9aa543e98cfc9b412afdde17b5f96d