Merge "Enforce test for AOSP defined sensors" into oc-dev am: 0a355a9471
am: ce893d7054

Change-Id: Iab88f581ae208df45ab7a0e862030f58ea0e5af8