[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
am: 6899489465

Change-Id: I09ee45bb1029f0a19d1d57fbc0826e5ac8612cf0