Merge "Reset single scan timestamp when disabling Wifi" into nyc-dev
am: bcb882b117

* commit 'bcb882b11790c1f4d64a78a0e0cb07dd0c227c6c':
  Reset single scan timestamp when disabling Wifi

Change-Id: I88ac8b4b03c5b45ea589e7aa86862b46c8ab4391
tree: 12c34698c9db96292139f4bfd09d1e743c4ae211
  1. service/
  2. tests/