Merge "Revert "Delete KM1"" am: aed1b5671f

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

Change-Id: I68d2442b6de642e5c50d3bd1f9f5f75b24f77380