Merge "Polish NetdBinderTest#InitialNetworksExist test" am: e68abb3686 am: fbe63f3dcf am: b2b1ba89e9 am: 2f866b0571

Original change: https://android-review.googlesource.com/c/platform/system/netd/+/1687687

Change-Id: Ib45dc39c7ef495795343ffafb1faa5d76478fb40