Merge "Check additional constraints on requestNetworkScan"
am: 9d3036297a

Change-Id: I3342c291c11850eff7180e607723bf963ac5cecd