[automerger skipped] Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into oc-dev am: 08d2780e1e am: d55320b524
am: 07113c9166  -s ours

Change-Id: I30252c941b0161ec513b5dba514d5486ae94e3a2