[automerger skipped] Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into pi-dev am: 7528ea151a
am: 5066671a8a  -s ours

Change-Id: Ibe126d6db025adc04a0736ecfd44744d8cd3abb6