Merge "Revert "Address API feedback on setOnRtpRxNoticeListener""