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