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

* commit '058061da46db0fdac8ea53c463a6b615fde3e928':
  Fix stopBatchedScan not working for wifi