Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" am: d3d0962cd1

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4f151b07b92e0c55a53b38216024858b9fd68ce