Merge "Cleanup user data when user stopped" am: 03d7a23d am: 4b3ece1d am:...

Merge "Cleanup user data when user stopped" am: 03d7a23d am: 4b3ece1d am: 0bb40dfb am: dcffe57d am: 15d6b84f

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



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