Merge "Revert "Revert "Revert "Merge remote-tracking branch 'aosp/upstr..."" into main am: b98a15a5e0

Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/3212256

Change-Id: I651aba5870d864112a2146ad67b309d14b6dd253
Signed-off-by: Automerger Merge Worker <[email protected]>