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