Merge "Delete keymaster0" am: 02cdce19c1 am: 1aeea8c95b am: 7bd15a3d38

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

Change-Id: Iccde59936d10078dd3e31041153c9a8369d11bdb