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