Merge "DO NOT MERGE: Merged Fixes for CTS Sensor test from master" into lollipop-mr1-cts-dev