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

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

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