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

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

Change-Id: Id3202b7e866d095c50df3c015515ad3926391a8b