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: Ia5a6b7890c50d8aa8811c6f14c0216d9e3fca5cd