[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into pi-dev am: 1fc26e2022
am: 2baf374ffc  -s ours

Change-Id: Ic5ddd0b7d87c9968523c084f3c3ce234b1ba1fdb