Merge "System crash during dismissing split in multi-user scenario" am: 49ab340c

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



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