Merge "SF: Fix mode setting for secondary displays" into udc-qpr-dev am: f8a25542

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



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