[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
am: 6d5e8a23bb  -s ours

Change-Id: I49a03da25c471209720f20ca475acaa7b3d4575f