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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fbfd4edc -s ours am: a4f51450 -s ours am: ed70ffaf -s ours am: 2cb5ff4b -s ours

am skip reason: subject contains skip directive

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

Change-Id: If9fdd2331626f86843dbb445de03a8da4ecf8549