Merge "Fix TetheredClient callback fail in InProcessTethering" into mainline-prod