Merge "Fix binding to TestNetworkStackService" am: c0deafb7df Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1903850 Change-Id: I1ccc3a46fb00de9e22f0e38a2fe012a6d5497ca4