Merge "Keystore:Add visibility to android-key-attestation" am: c4ed7a7569 am: 2b07540f63

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

Change-Id: Ia8cb615ce9167f4337ca26e77ae10b79294ef140
Signed-off-by: Automerger Merge Worker <[email protected]>