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

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

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