Revert "Revert "Add keymaster VTS tests."" am: 63e15f0790
am: 4de26e4c06

Change-Id: I1218c7c2459f239d0c0ad3e9982f75f9eb3de6be