Merge "Add missing UnsupportedOperationException for queue management" into nyc-support-25.3-dev
am: f6fa4e7cff

Change-Id: I17697ea01fc8dfffa7287e73e7ca65cf999e83d5