[automerger skipped] Merge "Keymaster 4.1 VTS tests" am: 75629017d2 am: 56b8c4ede6 am: 4486795de5 -s ours
am skip reason: Change-Id I488402079ebb3940e021ac1558aeee15c4b133c9 with SHA-1 b26a225b9c is in history

Change-Id: Idd06c9a2d71840344b5fe85375345b3c6f5649cd