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

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

Change-Id: Ia869e47edec33397ccac5ec97fddf633fc9b8ab7
tree: 09cd3e626573911924b345471f1b820894b581b8
  1. core/
  2. services/