Merge "Add MULTICHANNEL_GROUP to AidlConversion" into main