[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 43a1b4cac2 -s ours am: 0d0783929a -s ours am: 5c0818d397 -s ours am: 5d4cad98ac -s ours am: 308c7046d3 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420491 Change-Id: I1becf7e341d9fa3625736499acdb23177da98645
This commit is contained in: