Merge "Revert "Merge remote-tracking branch 'aosp/upstream-master' into..."" into main am: 1187ab9611

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

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