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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5921d42a619a91422f3b5e4ba25bae34a7917caa