[automerger skipped] Merge "Camera: fix HAL1 removeCamera crash" into...

[automerger skipped] Merge "Camera: fix HAL1 removeCamera crash" into rvc-qpr-dev am: 25f8e687 -s ours am: 4b7ca76e -s ours

am skip reason: Change-Id Ifd5fc7c63e3835945194291d161b491bd5acb342 with SHA-1 357e1dea is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13162902

Change-Id: Ib852378642d1e149db6818dd147d3d7cc9950aa6