Merge "Delete keymaster0" am: d87b1d1ace am: a3849fec82

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1515114

Change-Id: I3be37dacb4c1970538b18768a074ddcde38e468c