Merge "Allow more error codes on multi-padding failure" into main am: dc86c3e858

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

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