Merge "Add testHttpEngine_EnablePublicKeyPinningBypassForLocalTrustAnchors" am: 8f04e0d036 am: ab245d570a am: 5e6c06ad66

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

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