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

Change-Id: I3d963182b12d33718157576105d10c7da56ec228