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

am skip reason: Merged-In I084b69903f8ba7a6225b312560752e8508938714 with SHA-1 913037cb is already in history

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

Change-Id: Ie482c176343efa33e81a67df60130074afdd72ea