Merge "Only disable Wi-Fi IP serving on specific interface, if available"
am: 6428e1a4d4

Change-Id: I51f2e1864f5aaf1369e980f44537ab4f4a0e703e