Merge "Do not dismiss split if stages are not visible due to screen is...

Merge "Do not dismiss split if stages are not visible due to screen is sleeping" into sc-v2-dev am: c200310e

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

Change-Id: Ib587f4c4a9d01fdc25d8cf2e152a6c57e7b3b243