Merge "Delete KM1" am: 833a929d85 am: 22453fa420

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1846575

Change-Id: I46a1e39f3bd5695e17ad55cea390ee9ba63c66b8