[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515760 Change-Id: Iaeb0e95bf23d2a846dd1b03585b18b40a01431c8
This commit is contained in: