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

Change-Id: I4fcc149ff81dd2549e3f9fe712f308a360855d15