Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev
am: 57031aa47e

* commit '57031aa47e16e4d493c03df886c35c5081fcaeed':
  Don't run Wifi scan timestamp tests when location is turned off.