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 am: 84f3fc70

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



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