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