Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e am: 3f0866e144 am: 9bfb43c08f am: 3b7e1623b3 am: df3a267558
am: 975335db32

* commit '975335db321ccf2f0f6c4a6ff76525816644c96e':
tree: 69d66c2241a971c65468ea38a0540b4ca0e7c6c6
  1. tests/