[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 am: 3ed913ad8b
am: d3b0ae9af6  -s ours

Change-Id: I0e9563396328fd7286aec14dbcf395c28619d4cc