Merge "Delete keymaster0" am: d87b1d1ace

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

Change-Id: I76fbc563b095c7305c46a96413f7d24956f22d27