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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2107755b -s ours am: 1a01ce91 -s ours am: cd0a408c -s ours am: 82bb55cd -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7e75d610221454ebe3db8ec12869cf852d582631