am "New Additions to WifiScanner APIs [DO NOT MERGE]"

merged from partner/m-wireless-wifi-dev
f45acfe New Additions to WifiScanner APIs [DO NOT MERGE]