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