[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ade8130a6 -s ours am: 7a11b64a09 -s ours am: f8d1546611 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12771094 Change-Id: Ib12e1cb2b151263eff0d7e8ad1b5b50946688d89
This commit is contained in: