[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1015bae311 -s ours am: 838bc9752b -s ours am: 895e021100 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12796397 Change-Id: I5fbd090a2a65d60446963f934cf2bae46ec15c8f
This commit is contained in: