[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6ffba8f337 -s ours am: 222ea67d6b -s ours am: 4a67c2de34 -s ours am: 01a817bd9b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515760 Change-Id: Ibe71b9757bf93f8d703086c807271da384f9024f
This commit is contained in: