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