Merge "Camera: Fix OutputConfiguration equality check" into main am:...

Merge "Camera: Fix OutputConfiguration equality check" into main am: 04e59b17 am: 523dcae7 am: b5670c0f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2797213



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

core/java/android/hardware/camera2/params/OutputConfiguration.java

@@ -1403,6 +1403,7 @@ public final class OutputConfiguration implements Parcelable {
                 if (mSurfaces.get(i) != other.mSurfaces.get(i))
                     return false;
             }
+            if (!mIsDeferredConfig && mSurfaces.size() != other.mSurfaces.size()) return false;
             if (mDynamicRangeProfile != other.mDynamicRangeProfile) {
                 return false;
             }