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