Merge "Fix null deref in camera service" into main am: ef703eef am:...

Merge "Fix null deref in camera service" into main am: ef703eef am: 05a93a3a am: 612563da am: 21abd605

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2647674



Change-Id: If6fc0273442a8a289d5cce62f73386bedf4bfa2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>