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

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

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