Merge "Keystore 2.0: km_compat: Fix ref counting in software keymint device." am: 99ad4f31c5

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

Change-Id: I8bbf321498d25aca1d427d930dba0204391f704b