[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e7c8fcb8c5 -s ours am: 81ed4d7250 -s ours am: 828a6a935e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12518323 Change-Id: I5e5e7a34980f9550018944990200a377c203622c
This commit is contained in: