Merge "NetworkStackClient: Use @SystemApi alternative for isSameApp" am: 6a612863e6 am: e8ba3232b7
am: e22efafff8

Change-Id: I7370e38a5daef2560ddb3753de8255282d380f94