Merge "Add support for batched wifi scans." into klp-dev
tree: f7ed48211751dddbcb3d25e0e25529aa6635438d
  1. framework/