Merge "Fix: query TYPE_WIFI usage with empty string" am: 3bfd63e425

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727620

Change-Id: If4a883d96290adadc228526ec5e2518c8e566cf0
tree: a3725c6511d444f652bd1b8a29b8ce1ea789389e
  1. core/
  2. services/