Merge "Allow more error codes while trying to use incorrect APPLICATION_ID/APPLICATION_DATA." into main am: 611bab04ae am: d81f0f0c4d

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

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