Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a am: d3f26b6731 am: bdcebe39e6
am: 6a5016df21

Change-Id: Ibd1ef362cdc21d57aefb2d1180dc678bb2692f34