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

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

Change-Id: I841f93600c62313c8332bc7cb547c6551b551d37