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

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

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



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