Merge "Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into pi-dev
am: 1fc26e2022

Change-Id: I5331fde1ab499c4a4a797362f4539d8d1f26e2aa