Merge "Keymaster 4.1 VTS tests"