Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev
am: 74d82f556d

Change-Id: I4344edb030e161565b0a0b0203463668cbfd5a8b