[automerger skipped] Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev am: 7b08baaa2a am: 86fd67ac10
am: 81850301e3  -s ours

Change-Id: Ic64b71822d44369efc32b89cc6e4e3e542b98967