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 am: 6d4e8b4c

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



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