[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2422df027f -s ours am: 6fd3242312 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755814 Change-Id: Ic10d7d6001284405ca2e7e7bc8c99ecad2a37e32
This commit is contained in: