Android Mainline 12.0.0 Release 22 (7927206,com.google.android.art)
[automerger skipped] Merge "Add visibility for packages/Connectivity tests" am: 2b8eb1f62a am: 73bad426b3 am: 04e8de7696 -s ours am: 2ffc8c9e1e -s ours

am skip reason: Merged-In I2609e140fb4130c7d5bcfc206342811450d50037 with SHA-1 c73cb6ce50 is already in history

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

Change-Id: I1abcf035eff05ec39dd742ff9306b15f9b0c2420