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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 60b7757f -s ours am: 6ff3a882 -s ours am: 01a5670d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3ece308ab7a77fad0cf6f91b5081d56b3c41ed77