Merge "Merge "DO NOT MERGE: Test runs on devices that don't have a GPS provider" into lollipop-mr1-cts-dev am: edb56bf663  -s ours" into marshmallow-cts-dev
am: 6ca0188da4  -s ours

Change-Id: I5f100ef461e33f0ba783743e1104c2a79bcf68ac