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

Change-Id: Ic20158d06fa679353a886b63b22680771f69a960