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

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

Change-Id: Ia399c63202728a95f9d3b1b73c0d34feca5a7077