Merge "Merge "Reset single scan timestamp when disabling Wifi" into nyc-dev am: bcb882b117 am: eb6b69f6c2" into nyc-mr1-dev-plus-aosp
tree: 12c34698c9db96292139f4bfd09d1e743c4ae211
  1. service/
  2. tests/