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