Merge "Revert "Delete KM1"" am: 0531c94771 am: 7e0f50f4fe am: cb8a6b42d2 am: 1977dffb15 am: a47931ad1f

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

Change-Id: I9e8aadf21c1f372458caf5e006a0ec714f449f2b