Merge "Add testHttpEngine_EnablePublicKeyPinningBypassForLocalTrustAnchors" am: 8f04e0d036 am: b3595c280f

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

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