Merge "Remove one duplicate comparison from OutputConfiguration#equals" into...

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

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



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