Merge "Reland r8 shrinking w/o optimization." into main am: fc7232e169

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

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