Avoid IllegalStateException by calling next before remove

Test: build
Bug: 341854556
Change-Id: I20522e9f53545e0983d4c3c78390525a3fe081f0
1 file changed