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

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

Change-Id: I0b1e02e59d68a2f9505eaa38ff4d9edace5f3734