[automerger skipped] Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into oc-dev am: 5315bbfbc7 am: 02d1a54dcf
am: 3b8808869a  -s ours

Change-Id: I73c45e48807b6c188a6258f6a758ec358b0d024b