Merge "More robust app data and user data removal." am: 0a258b89c7 am: cccc28a1b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1983127

Change-Id: Ide48f3073f3d0cf2b683b5afb79dcf0c5cbc2252