Merge "Revert "Delete KM1"" am: aed1b5671f am: 9b02e2d2ad am: ff055f2cd6

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

Change-Id: I1ea7d1bac8c447cf35333f55bad16de024571648