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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4f66623b -s ours am: c4c67a59 -s ours am: b2c8f39f -s ours am: e6eaedb2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id81165c333129c9427918adc3ce2fa63f3c27dd6