Merge "Camera: Fix OutputConfiguration equality check" into main am: 04e59b174f

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

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