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

Change-Id: I73e9ef317927f133497b0fbf2b05f6e1b279f8c0