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