Merge "Use doReturn instead of when().thenReturn" into main am: e73285c622 am: 251eae0b79

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

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