[automerger skipped] Merge "Fix: query TYPE_WIFI usage with empty string" into...

[automerger skipped] Merge "Fix: query TYPE_WIFI usage with empty string" into sc-dev am: 750ed6aa -s ours

am skip reason: Merged-In I084b69903f8ba7a6225b312560752e8508938714 with SHA-1 6a358bf0 is already in history

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

Change-Id: I9da6e8a753a9e3f99f01a3054e09434c5217267e