Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."

This reverts commit 5e37e9d962c476202590bef32b87c2eb794d61a1.

Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug: 114365189

Change-Id: Ia12ce2692b47a1d59be0b199b1fbfa415767e145
2 files changed