Merge "Skip tests using APPLICATION_DATA on older devices with Keymaster implementation." into main am: 106738aa7a am: ac09d078b6

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

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