[automerger skipped] Merge changes from topic "get_attestation_input" into...

[automerger skipped] Merge changes from topic "get_attestation_input" into main am: 7c8b795e -s ours am: 1fd03145 -s ours

am skip reason: Merged-In I29bb8f9108747a0ed2a1a678811858e8572d285f with SHA-1 9a5cc83e is already in history

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



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