Merge "Delete keymaster0" am: d87b1d1ace am: a3849fec82 am: da306dc2f7

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

Change-Id: I14e9fc012de7b1b7a51795e7199289e1d17273a6