Merge "[Passpoint] Changes required for bouncycastle update" am: c7a4149471

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1ee6e0541978e5d1a1a79ab03b02c4b592424ac