Merge "Fix exploit where can hide the fact that a location was mocked am:...

Merge "Fix exploit where can hide the fact that a location was mocked am: a206a0f1 am: d417e548 am: 3380a775 am: 0a8978f0 am: 1684e5f3 am: d28eef0c am: 1f458fdc am: d82f8a67 am: 1ac8affd am: 56098f81 am: 7cec76de am: 2da05d0f am: 3b7d90c0 am: f035e8b4 am: 1cc8a2a6" into nyc-mr2-dev-plus-aosp
am: 52c35fb3

Change-Id: I4a11e981e063c370d358175d2d1f6396db65ec38