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