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