Merge "Implement the new requestNetworkScan API with current modem API." into oc-dr1-dev
am: c867929282  -s ours

Change-Id: I482b33a04a69c918b0af8f19ec1c954cb464bdbe