Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 0699745a3d am: 837d7c87a9

Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2