Avoid NoSuchMethodError of List.removeFirst() on 24Q2

It's a temporary problem on 24Q2 before the new API lands on 24Q3.
In this CL, the callsite is fixed to avoid calling the API that doesn't
exist on 24Q2.

This CL tries to fix the problem caused between mainline and the new flag system.

Flag: None
Bug: 325223792
Bug: 326109524
Test: m droid
Change-Id: I1d32a7e1878c176dc08e60284853ccb64d649866