Merge "Restrict functionality testing for android defined sensor" into oc-dev am: cc73ddb143 am: d518a75edb
am: df1840c1e3

Change-Id: Ie55087bd79ee9ad5d0499018e4ff9cf5f6d817b2