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

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

Change-Id: Ide16292fc7f49ecab93c5847a1764928ea3fee9f