Merge "Include SDK sandbox process in package uid check" into main