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

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

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

Change-Id: I67c839ee8dd1f0b894538a686ba7aa47cdcbbdac