Merge "Use per-user Shell UID for adoptShellPermissionIdentity()."