Merge "Add OWNER for keymaster VTS" am: d3e783be43 am: fc5b6ac127

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2024663

Change-Id: I00e035aa49e58b20de9c3adf1ca546b5acb93d2e