DO NOT MERGE: Merged Fixes for CTS Sensor test from master

Merged following commits:
https://android-review.googlesource.com/#/c/140940/
https://android-review.googlesource.com/#/c/143337/
https://android-review.googlesource.com/#/c/140950/
https://android-review.googlesource.com/#/c/140922/

Change-Id: I67c275bf6df229a78d3d489bdec3b990b72cfda0
4 files changed