Merge "libaudiohal@aidl: Follow up for callbacks handling" into main