Merge "NetworkStackClient: Use @SystemApi alternative for isSameApp"