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