Merge "Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into pi-dev