Merge "Cleanup user data when user stopped" into tm-qpr-dev am: eab8ac08

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



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