Merge "Pass callingUid and callingPid to startNetworkScan"
am: 1da57acea4

Change-Id: I07a6831b0916e70ee2641f1f3bce1d80718e5453