Merge "[automerger skipped] [automerger] RESTRICT AUTOMERGE: Check both self...

Merge "[automerger skipped] [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da67866 am: 7d153c56 am: eff2a463 am: ee4a2aee skipped: 879ecd17 am: 47a4d99c am: 15682d0b am: 4c0878bf  -s ours am: 02fff3e2" into pi-dev-plus-aosp
am: 2c148c58  -s ours

Change-Id: I43a4f86c8fbf94a8130d11e5c826e9657ff03d7e