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

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

Change-Id: I29548e1694e3928922e0b0c3f5cf49f47376a524