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