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