Merge "Keymaster 4.1 VTS tests" am: 75629017d2

Change-Id: I44e678dac52ec15b7c3d1884735582495dfd21ab