Merge "Revert "Delete KM1"" am: 0531c94771 am: 7e0f50f4fe

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

Change-Id: I2bc88903556a42984553014cdbd3010939dded25