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

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

Change-Id: I7e6164caa7a21721e182f4645ab73ac661639797