Merge "Fix FD leak in ConnectivityManager.getConnectionOwnerUid" am: 20bdc26698 am: 0b6d974713 am: 48547ce1d0
am: 1fae7704a5

Change-Id: I300447908f81be7e11d92a0b053731b6ccf2d888