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

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

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