Merge "Add API to support async network scans." am: 625d5a9dd9
am: 8d692eb811

Change-Id: I0aef12a6d1617b594cd1ed050ed0a02043ae5aba