Merge "Make sure to reorder side stage above main stage to prevent flicker"...

Merge "Make sure to reorder side stage above main stage to prevent flicker" into sc-dev am: 5663de78

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

Change-Id: If2db0a33ae25332ae958e10a9c7e8511eb311c3b