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