Merge "Prevent NPE when dropping app icon to split" into sc-v2-dev am: c739eabb

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

Change-Id: I6d0467366b4b9e487cec5e20f2eefd6985e099cf