Merge "Revert "Revert "Add testHttpEngine_EnableHttpCache""" am: 21af035644 am: 0ea9595d3a

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

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