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