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

Change-Id: Ic71fbd6f6b8a5c6d3cee1f862e4ed649c0c71a13