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

Change-Id: I5bb73bfbea21a3dc14efb65d07c5712f41aa0f54