Merge "Fix bug with trying to split an app with itself" into tm-qpr-dev am: 5107dff0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21152798



Change-Id: I8f102c0c6a0bc14ba9a4cd47f966a656acca194a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>