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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66d08a63a109ef4e4a14c266773266b216b17f5b