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