Merge "Defer the app data fixup until we are done with app data clearing...

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

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

Change-Id: Iacf42807eb263dda9f21e83c838c3d046769ab2d