[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
am: bfd66d5087

Change-Id: I1a103049b009f15110816574993a55b1cfa4c6a9