Merge "Camera: Fix potential null pointer dereference issues" into main am: c0ccfdfb

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



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