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

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

Change-Id: I52a22b268688f8c20e36f1546179a1c2bb69b89c