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

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

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