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

Change-Id: I5b8def0055bb8f7062405b1f354c1edf6292a129