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

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

Change-Id: I6f8f31d5fa9a4aeab4178b4706cc1d3381ee393e