Merge changes from topic "ethernetmanagertest" am: 14c851ccc3 am: 9f7305adcd

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

Change-Id: I2855d75cbea96b2165bc9500a11008a91e2ee851