[automerger skipped] Merge "Fix bug for user removed case" am: 1db4d8b3 am:...

[automerger skipped] Merge "Fix bug for user removed case" am: 1db4d8b3 am: 3932482d am: db2a8255 -s ours

am skip reason: Merged-In I400e2d9d3ec8b76a293856c44375bb1d302c530f with SHA-1 fccaf824 is already in history

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



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