Revert "Checkbox for removing contributes files"

This reverts commit 38ea50c6.

Revert and clean up merge conflicts. The checkbox which asks
to remove app data is still here

Fixes:112002130
Test: Build and check that the correct box is gone
      atest CtsPackageUninstallTestCases

Change-Id: I47d8632d2fca360c02151ad54a4b927a5c2801f1