Merge "Update KeyMint VTS tests to use pre-defined API level symbols"