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

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

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



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