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

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

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