base

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

merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed