[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
am: 36b42a3ebb  -s ours

Change-Id: If72e49fcb4d66a2ae93da8b4dfd2aac7a262e0df