Merge "Revert "Exclude testNoResidualPermissionsOnUninstall from presubmit""