Merge "Pass callingUid and callingPid to startNetworkScan"