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

Change-Id: I5cf5be0e604092777858388c0ceadc5fe93ab1bd