[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: aabad94a4d -s ours am: 5d29c1510b -s ours am: 836eee53ef -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779439 Change-Id: I40df8119ef463957bdd2086573c41d448e2f07e3
This commit is contained in: