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

Bug: 111752150
Test: Manual local test

Change-Id: I80383300cd5d2455d08a0ad91000efa85404903b
(cherry picked from commit 5e37e9d962c476202590bef32b87c2eb794d61a1)
2 files changed