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

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

Change-Id: I6d8e17070486aa056bf7a94cb366e1ad5e50627f