Merge "Clean up SensorHalServiceBase, SensorBase" into qt-dev