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