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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37e85a8503764d26ff36f87a596495d72a7f799c