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

Change-Id: I1a4788243caac0ef9095da134438813b1caf5a24