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

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

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