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