[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 764c3e4c94 -s ours am: 43dec636d7 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943415 Change-Id: Iff3613c9f2c738b35d22c3436cc096c2978788e0
This commit is contained in: