Merge "Add addPublicKeyPins test" am: d18610d9b1 am: 297d701355

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

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