[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6670c24067 -s ours am: 619e3f9aac -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684937 Change-Id: Ibb87884da80c200c489323a6acfe461aa798e389
This commit is contained in: