Merge "Align AIDL effect proxy behavior with HIDL" into main