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

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

Change-Id: I0040bfdf11b37c4eed9e51da1a0bc625dcd67fae