Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev am: 6c7014dd52
am: 4f4fa12784

Change-Id: I529ca49c7d6c48162679b4df64c05646f33b17da