[automerger skipped] Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into oc-dev am: 08d2780e1e am: d55320b524 am: 07113c9166  -s ours
am: 3ed913ad8b

Change-Id: I80c66f256619ecd51183fd53b7cbfed5304b2543