Fix net_test_osi am: c757c89b20 am: 5ea1923be7 am: 137884f281 am: d3363286c5

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1740854

Bug: 191431228
Tag: #refactor
Test: gd/cert/run --device
Ignore-AOSP-First: Cherry-pick to release branch

(cherry picked from commit b9eb2c51c7a7af64da6f622efbc2f822c3c000c8)

Merged-In: I25e3a8aa16dce375fed79133b1e1561d914c6a8d
Change-Id: I25e3a8aa16dce375fed79133b1e1561d914c6a8d