Merge "Implement the new requestNetworkScan API with current modem API." am: e9a9da0358
am: 78c86260e8

Change-Id: I93cdf1209329644451da5cd5dade37f4c8c5dab9