Merge "keymaster_test: change keymaster API version to 3"