[automerger skipped] Merge "Allow more error codes on multi-padding failure" into aosp-24Q3-ts-dev am: e2a6621e72 -s ours

am skip reason: Merged-In I3b731e7ccf52e561170e99f23c89fca437c156d8 with SHA-1 7068dda87f is already in history

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

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