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

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

Change-Id: I83a75ef2109c5e5325a242daa60d0d6bbbbca888