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

Change-Id: I28952a2c20d9fc0f7cff38774cd7a1e1cd6b12ab