Fix sensor test case issues:

b/11599542
b/11547842

Change-Id: I9bae43483b54692f32e284f499ac0b23532d1069
4 files changed