Merge "Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into pi-dev
am: 15b4e62dbd

Change-Id: I6368bccd8932c1c61e0de9aa2586a52ab4c60542