Merge "Fix an NPE when a user is added and then removed quickly" into main am:...

Merge "Fix an NPE when a user is added and then removed quickly" into main am: 48fa5320 am: 68a09e68

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



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