Merge "Convert EthTrackTest from when() to doReturn()" am: 3db58490ff am: b310e4af35

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

Change-Id: Ib7bdd3496614dff42866f44826faad45feaad390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>