Merge "Revert "Revoke permissions defined in a to-be removed package.""