Merge "Make apex availability to com.android.wifi explicit" into main am: 8bafbfe071

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

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