Fix stack height jump during lockscreen=>shade and aod<=>ls

Fixes: 229882633
Test: NotificationPanelViewControllerTest
Test: press power button to wakeup and sleep
      swipedown from lockscreen to go to shade
      => observe no stack height jump
Change-Id: I6575f733b17d6c8905150c0a7854d752dd0a5cfe
2 files changed