Merge "Improve system API coverage for BootstrapAuthenticationCallback" am: e8557ca4ad am: 6dad4368be am: 3b2bd7684f

Original change: https://android-review.googlesource.com/c/platform/cts/+/1673850

Change-Id: Ia9ba43dc7a2605a78b2b30e08b1cf723bbc9ad29