[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0d54de1b3c -s ours am: 2db08cea7e -s ours am: b6c6b81bc2 -s ours am: 2394a52400 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14404545 Change-Id: Ie984dcdff66e6afd2b997e7bb95e3078f7a97742
This commit is contained in: