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

Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2