[automerger skipped] Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into pi-dev am: 81c0878e2d
am: d220179288  -s ours

Change-Id: I112f35800f1f5becf4c65040f35667d106045866