Merge "[automerger skipped] [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 skipped: 879ecd17ab am: 47a4d99c0c am: 15682d0bd4 am: 4c0878bf74  -s ours am: 02fff3e2eb" into pi-dev-plus-aosp
am: 2c148c58a6  -s ours

Change-Id: I43a4f86c8fbf94a8130d11e5c826e9657ff03d7e