Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b415ead18 -s ours" into sc-dev am: a71fe535c8 -s ours am: 72946e94ac -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15209698 Change-Id: I11f48842f35a28fe5768f578a1f13c855d02bc12
This commit is contained in: