Merge changes from topic "revert-10057725-IDGRNKQGYI"

* changes:
  Build framework-wifi against core_current & framework-system-stubs (Attempt 2)
  Fully qualify android.net.wifi.ScanResult