[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
am: 1e5ff973e7  -s ours

Change-Id: I6c806a752f9c88eb8c99e9c6fccecc684ab88bd8