Merge "Fix FD leak in ConnectivityManager.getConnectionOwnerUid" am: 20bdc266 am: 0b6d9747 am: 48547ce1 am: 1fae7704 Change-Id: I300447908f81be7e11d92a0b053731b6ccf2d888