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

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1986712

Change-Id: Iafa0fd7ada992d6fd72d2d8b03458dc5c06c165a