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

It is already deferred and executed in another thread.
This avoids lock contention on clearAppData vs fixupAppData.

Bug: 216206114
Test: presubmit
Change-Id: Ib85db2789b300211ff780f0423cda07b961efe37