am e781efd6: am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
am e781efd6: am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev

* commit 'e781efd651cea0fecf3a155a61cca3eed8e9766c':
  Fix stopBatchedScan not working for wifi

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base