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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0a0426bd -s ours am: abcd4d28 -s ours am: df176846 -s ours am: 26404166 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If10e85e1f8ca1a4a02f8ad5b3b958b6bc9624582