Merge "Allow apksig-test to access bouncycastle-unbundled" into main am: ef3adaa024 am: b09e9aef29 am: 3cb766ded9

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

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