[automerger skipped] Merge "Add getSupplementaryAttestationInfo" into...

[automerger skipped] Merge "Add getSupplementaryAttestationInfo" into aosp-main-future am: 17b0bd65 -s ours

am skip reason: Merged-In I2bac10ad148279ea3aa3907a982a3e598502c788 with SHA-1 c5fe9b63 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/30688594



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