Merge "Update hostapd domain for /data/misc/wifi/sockets label change."