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