Merge "Camera: Fix a removal-while-iterate bug" into rvc-qpr-dev am: c1082ad3

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

Change-Id: I0a6633ab3c40171fbe4c1a3b1b9978e10b4e638b