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

* commit 'cd046b143b5866a447b12389c8e66422bdde247b':

Change-Id: Ie234ad0ae0ba4d856b07cdc80d0e3125d40c0420
tree: e60e6c83a608b5e51dfe8dc3e3d0f57a5108830c
  1. service/
  2. tests/