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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd7ee95e0e51137ec64342dfc308a0420c99ed5c