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

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

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