Merge "Camera: Fix double-free in removeCamera" into sc-dev am: 22bebf247a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20cc614585377955ed8208b32c86900407951fdd