Merge "Fix a outer loop iterates on item that is removed by inner loop...

Merge "Fix a outer loop iterates on item that is removed by inner loop problem." into udc-dev am: dab1a630

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21567200



Change-Id: I9fd9e8a687afd5ea65c1f11fbc58cd6966a6ef89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>