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

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

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