Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e1 am: d3f26b67 am: bdcebe39 am: 6a5016df Change-Id: Ibd1ef362cdc21d57aefb2d1180dc678bb2692f34