Merge "Allow more error codes on multiple block modes failure. Updated tests to use `APPLICATION_ID` along with `APPLICATION_DATA`." into main am: 7edac20066

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

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