am 463aacfb: Merge change 6661 into donut

Merge commit '463aacfbd220c9ef2f6ed915d54092289fdac05b'

* commit '463aacfbd220c9ef2f6ed915d54092289fdac05b':
  wifi: WifiManager.startScan() will now do passive scans by default.