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

Change-Id: Ie963bfc2a22b5c2cb84e71611af755dc23594086