[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f5557f625c -s ours am: c5ae3407f5 -s ours am: 4e1fb6296c -s ours am: 8bef3dd98b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15550617 Change-Id: Ie499afdf38100da00dcc7f487da965cd84b0c932
This commit is contained in: