Merge "Update KeyMint VTS tests to use pre-defined API level symbols" am: 657934eebb am: 0d230e35c4 am: d8fa7a9d57

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2450566

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