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

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

Change-Id: I3bb497f111859bdabf2d08f257021a454618adec