[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 56b07dc8db -s ours am: fb62b42a99 -s ours am: 22dd6164a8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16925818 Change-Id: Ia185c88ed7ef6c61bcc686b64d3c7a43c9efc992
This commit is contained in: