Merge "Codec2Client AIDL: config output surface consumer usage" into main