Merge changes from topic "ethernetmanagertest" am: 14c851ccc3 am: 07aad5a3e0

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

Change-Id: I14c4f0319fdab30fb62fc1b6d6e468be0f7815d2