Merge "Add a test for TetheringUtils.setupNaSocket." am: d5edbb9eb4

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

Change-Id: I2f7f6a5dcbc363bca3d113c0b2cb8e87aae450f2