Merge "Merge "DO NOT MERGE: CTS test for mock location exploit" into marshmallow-cts-dev am: 5dd2a7d6ca  -s ours" into nougat-cts-dev
am: 69ca898c5f  -s ours

Change-Id: Iea5956e50f8b7e11c8a27c3973229c6980832042