Merge "Fix bug for user removed case" am: 1db4d8b36a

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

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