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