Merge "[Cronet] Make CtsNetHttpTestCases installable on older devices" am: c8fee363bb am: 02ef1c4ecd

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

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