Merge "[Cronet] Cancel stream before shutdown" into main am: 89e4a09d62

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

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