Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev am: 7b08baaa2a
am: 86fd67ac10

Change-Id: Iae5fb04618205bd0c56a63ce160efe3b2eddc8a2