[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 54e8c4aa35 -s ours am: 3ca321c20c -s ours am: d6028c0c3d -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420157 Change-Id: I104328703d3ff3f1926d8767cf1cee6662707d89
This commit is contained in: