Merge "ConnectivityManager: allow usage of TYPE_NONE" am: 279f32ded5 am: 0537f16516 am: 0278aa4b70
am: f060ecf1e8

Change-Id: I1e005686a1de5f2154fbc614ea52ce1a3ff5fc81