Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 03c1364b16 am: 28220533d8 am: 8669be6a1b

Change-Id: I5706151c291cbdbc3a1f73ebb3669f56a61509ba