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

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

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