Merge "Camera: Fix potential null pointer dereference issues" into main am: c0ccfdfb67 am: 1869eb7ab0 am: d6b76cf13c

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

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