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