Merge "DO NOT MERGE: LocationManagerTest runs on devices that don't have a GPS provider" into marshmallow-cts-dev
am: 1abb2f0433  -s ours

Change-Id: Ibb184071b956827d560a75e2ff79b55e2253b397