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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 24f4aada -s ours am: 1b0a8946 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If0beeee35623ffeb01b87b3ac9f41e8865a0ce11