Merge changes from topic "get_attestation_input" into main am: 47550b3f17 am: 9ceed264f6

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3341710

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