[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b7dc979577 -s ours am: fba69cad44 -s ours am: 30bc6bf3d0 -s ours am: 6e766a7728 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470260 Change-Id: I3f77259fb8f6b746e06441c9ddd075a3f8b745fc
This commit is contained in: