Merge "Defer the app data fixup until we are done with app data clearing above." into tm-dev am: 81e3ad3f am: 35034af7

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

Change-Id: I576ec70c4d2018334034bd3cda32725b5cf74469