[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14a9e208c7 -s ours am: 424cf3e399 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12509747 Change-Id: Iaa530a831bf12b8a57539e3a5098fd281c196911
This commit is contained in: