base

move code back to original spot

The inital thought was to only create PostInstallData when it was
used later [during the restore]. Unfortunately, it is also used in
normal circumstances for pkg installation.

Bug: 22947287
Change-Id: Iab46183e57250e0f773538dc7156f65f461a3eeb