Merge "Setting sensorType in AIDL SensorEvent."