Merge changes from topic "ethernetmanagertest" am: 14c851ccc3

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

Change-Id: I95907044d1ef728d1780f1b9bcb4a741a3213dab