am 6a4d762c: Merge "Fix for ScanResultTest and WifiManagerTest" into mnc-dev

* commit '6a4d762c27b3921ca361602925d0e670f31b5cde':
  Fix for ScanResultTest and WifiManagerTest
tree: 8688dfa3a97ac6307d1fb4bff999ef15ff50c63d
  1. tests/