Merge "Only allow passing in calling pid/uid for SafeActivityOptions" into main