[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 730089156f -s ours am: 32bcd97325 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420418 Change-Id: I3195d63d621ef3496f53f86c8d37e00bd85cbeb4
This commit is contained in: