Merge changes from topic "ethernetmanagertest" am: 14c851ccc3

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

Change-Id: I3796356c9233b5bc284c968aed7df9adf5cf3fcf