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