Merge "Add addPublicKeyPins test" am: d18610d9b1

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

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