Merge "Allow apps with ACCESS_WIFI_STATE to listen for wifi networks"