SF: Don't override active mode with desired mode

getDynamicDisplayInfo().activeDisplayModeId should
not return the upcoming mode if we are in the process
of a mode change.

Bug: 180090041
Test: presubmit
Test: atest DisplayTest
Change-Id: I8b2b80f5ce1f57e4652d8794fd40a1f78715af6f