Merge "Add testHttpEngine_EnablePublicKeyPinningBypassForLocalTrustAnchors" am: 8f04e0d036

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

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