[automerger skipped] Merge "Fix launcher crash and correct split behavior"...

[automerger skipped] Merge "Fix launcher crash and correct split behavior" into sc-v2-dev am: b017001a am: a36f06c8 -s ours

am skip reason: Merged-In I2e6deb2ac607b454ca8fc760f0399135a1e8e901 with SHA-1 3ad89e67 is already in history

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

Change-Id: I686bf8a1e1891cfccaee0ab1c753ac9a46fc5df6