Merge "Camera: Fix double-free in removeCamera" into rvc-qpr-dev am: 229e07f9b9 am: d8fa145b04

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a8cd6ce83b68a5154ba9859899259a7cc5400de