[automerger skipped] Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev am: 74d82f556d am: 3f2bc41d8b
am: a97e0908a4  -s ours

Change-Id: I84dd1504a9335e692b3aebf8e696514e17048de4