Merge "Remove one duplicate comparison from OutputConfiguration#equals" into main am: 1af4d7bf81

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

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