Merge "Add getSupplementaryAttestationInfo" into aosp-main-future