Reland ag/24529645

This is a regression introduced in ag/24529645
(one of the fixes of b/263958603)
and detected and reported in bugs below by WearOS team.

Origninal bug
Bug: 263958603

Regressions:
Bug: 297438857
Bug: 297458852
Bug: 297461435
Bug: 297831980

Test: atest net_test_stack_sdp
Ignore-AOSP-First: security
Change-Id: Ie7210673d65656ef9dbb2a4759a3636025b67b44