Merge "Clean up the legacy split screen (6/n)" into tm-dev am: fafcf3c4

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

Change-Id: I402a729c6a5ec1e8c497105f0a8d00a06cb64324