Merge "Camera: Add physicalCameraId to OutputConfiguration"