Merge "Fix FD leak in ConnectivityManager.getConnectionOwnerUid"