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

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

Change-Id: Ib5a8d564723118065ef7a2b9e971f588f086ea2f