Merge "Move ConsumerIrService to HIDL HAL"