Merge "DO NOT MERGE: Test runs on devices that don't have a GPS provider" into lollipop-mr1-cts-dev