[automerger skipped] Merge "Fix FD leak in ConnectivityManager.getConnectionOwnerUid" into qt-qpr1-dev am: b3c533768d -s ours
am: 8e24b7effc -s ours
am skip reason: change_id Ib76674f10e4bd24952c557bac7b9c65fba42fdb2 with SHA1 59940afb16 is in history

Change-Id: I6ce0264e0a310683f2e7a99a275eb3a6a1c7209f