Merge "Camera: Fix null pointer exception in CameraServiceProxyWrapper" into udc-dev am: 218db79e

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



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