Revert "Delete KM1" am: 4515a7fa83 am: 8e563b142f

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1853097

Change-Id: Ib7145e8c51949273f0f317a3f4d35d72dadf4577