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

Change-Id: I9d7be7013b1d70c5f3b1fef0399236c105f4196f