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 am: 0d7b35a2

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

Change-Id: I90b4b2aa248dee826385f5cba44e239448199d19