[automerger skipped] Merge "Fix bug with split screen not recognizing user differences" into tm-qpr-dev am: 4bce4f6193 am: a2d9d1de48 -s ours

am skip reason: Merged-In I1ec49c75d562e4309a41d98010f0eff113c81e9d with SHA-1 0c5262b9e1 is already in history

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

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