[automerger skipped] SF: Fix display mode transitions for multi-display am:...

[automerger skipped] SF: Fix display mode transitions for multi-display am: 76742845 am: 0f7e36bb -s ours

am skip reason: Merged-In Iebe1a6bb4749630333ef954955ac33807c95dd9f with SHA-1 fc378b0b is already in history

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



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