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

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

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