Merge "Refactor sensor list in SensorService" into nyc-dev
am: df4f17e

* commit 'df4f17e100e56a1f2964797ad83499e07ba9e062':
  Refactor sensor list in SensorService

Change-Id: Icf06548c50ae7bf38590dc32a212252b95b606a7