Merge "System crash during dismissing split in multi-user scenario" am: 49ab340c02 am: 2d615930bf

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

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