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

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

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