Merge "Remove stage type from split screen APIs" into sc-v2-dev am: 4ce27c5400 am: 068afd51b3

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

Change-Id: Ia37698a75e4a679717b056e6ba423641cf11b9fc