Merge "Delete KM1" am: 13274fa22d am: 9c379e224f

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

Change-Id: I6d7acf78da1a57e078ffd21378d2021740633960