Merge "Move markSocketAsUser to the top of IConnectivityManager.aidl"