Merge "EthernetTetheringTest: test RFC 7050 prefix64 discovery" am: 7376fe0714 am: cf2dc1f3c5

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

Change-Id: I293a80ca304ae6e6180f2eca628faf39b8f4111b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>