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