Merge "Revert^6 Merge remote-tracking branch 'aosp/upstream-master' into merge-177" into main am: 705bc7930e

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

Change-Id: I1c96d044074e9185114efce84bb3823c58ed23cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>