Merge "Fix binding to TestNetworkStackService" am: c0deafb7df am: 1608662a1f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1903850

Change-Id: I457af7b156965546e79d2f0c7fbbdc73a32a390a