Merge "Always cancel requests during tearDown" am: 42b5c0e197

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

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