Merge "Add addPublicKeyPins test" am: d18610d9b1

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

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