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