Merge "Revert "Delete KM1"" am: aed1b5671f am: 9b02e2d2ad am: ff055f2cd6 am: da1f4e44ad am: 4bbd67ca92

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

Change-Id: I8c51bc4e1529acbe202a690c66596043c203524a