Merge "Use new AIDL IR interface for ConsumerIr service"