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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b2408c5b -s ours am: d2d22dd8 -s ours am: 1cfe9d75 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68598c3575c1d38a578df38085c615e1afbbd086