Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857

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

Change-Id: I537e8fab411b8134cf43d71790ebe62d238a71b6