[automerger skipped] Merge "Cleanup user data when user stopped" into...

[automerger skipped] Merge "Cleanup user data when user stopped" into tm-qpr-dev am: eab8ac08 am: dc81c557 -s ours

am skip reason: Merged-In Ic11cbd3f3d59a0165be882c2ce975a2c4d00b1a1 with SHA-1 25a3fa9d is already in history

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



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