[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2bce62522f -s ours am: dc3e015589 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15961562 Change-Id: Ifac11832635a133b5a669805f6192f3d50bd5b04
This commit is contained in: