[automerger skipped] Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev am: 74d82f556d am: 3f2bc41d8b am: a97e0908a4  -s ours
am: 5b1976e338

Change-Id: Ie0044a79440f322080d2aeeb3a43cd01a45ad96b