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

Change-Id: I22e8238c5ed83d1cdbea7b1c34664f029fc1f4b1