Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into pi-dev
am: 7528ea151a

Change-Id: I840f154b826148ecca937bcf2d67ccd1ac2a7d3a