Adjust the index of the ArrayList during iteration

Decrement the index when an element is deleted during
iteration to avoid the index going out of bounds and also
some elements getting skipped.

Change-Id: Ie4a57e02d684d598cd971c4ce6866579b65345d3
CRs-Fixed: 613390