Merge "Expose the scan API and network select API." am: 761b7b50d1 am: a9083c3145
am: 3fc3857a73

Change-Id: I90d8d01ecedfa7993852041a7da811899f71cb64