Merge "Camera: fix HAL1 removeCamera crash" am: 2b8f95789e

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

Change-Id: I687e22222e2228a91b0364efae51277cf6cd9c4a