Merge "Keystore 2.0: km_compat: Fix operation slot accounting."