[automerger skipped] Merge "SF: Fix mode setting for secondary displays" into...

[automerger skipped] Merge "SF: Fix mode setting for secondary displays" into udc-qpr-dev am: f8a25542 am: 96f03f6a -s ours

am skip reason: Merged-In I9da3a0be07f9fbb08f11485aa6ab9400259a4e09 with SHA-1 fdac5651 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23875797



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