[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: dd7397e3 -s ours

am skip reason: Merged-In Ia147cbac15ebce70bbbcc52926089f33901a99dc with SHA-1 08a4570f is already in history

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



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