Merge "Helper function/class to sensor cts test" into oc-dev
am: 37259dbaf6

Change-Id: I86ab5b51099e6888f793769909d3f56a2b9a495c