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

Change-Id: If661321a74436c850652e728e16cf13e8de83668