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

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

Change-Id: I380c626d1d409b487674d976d23363c91edbdd00