Merge "Update SensorManagerPlugin to have vendorType"