Merge "Delete keymaster0" am: 02cdce19c1

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

Change-Id: I3ed294c69ce86a036110fb5c5a95fb6f5737ac07