Merge "Fix FD leak in ConnectivityManager.getConnectionOwnerUid"
am: 20bdc26698

Change-Id: Idb8ecfa8313ed6c795af7fe97961ef002384580d