SF: Fix display mode transitions for multi-display am: 7674284566

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

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