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

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

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