[automerger skipped] Merge "When a user is removed make sure we remove their...

[automerger skipped] Merge "When a user is removed make sure we remove their persisted bubbles" into tm-dev am: f0f1105d am: c6b3c54c am: c554105e am: f2b80585 -s ours

am skip reason: Merged-In Ia147cbac15ebce70bbbcc52926089f33901a99dc with SHA-1 4a824f39 is already in history

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



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