Merge "Move 'session' field to AudioPortExtSys AIDL"