[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Check both self and...
[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into pi-dev am: 15b4e62d
am: f96dc5fa -s ours
Change-Id: Ia03052b8469393c3e336cb2d3a8972e8df3286f2