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

Change-Id: Iee5e44b4f6a9a8921a89c05640be4d52e0251bb8