Merge "Sensor HAL 2.1 Migration"