Merge "Camera: Avoid possible instability when adding new devices" into sc-v2-dev am: fb5539fafd am: 92ac88f919

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

Change-Id: I04927a5443c563664c00631fb75e414a38107a72