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

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

Change-Id: I87dcb2ee9608d32dbc8a1482c90c985638d731d3