Merge "Keystore 2.0: Remove unused mock KeyStore." am: df1b107ad9 am: f3ba769140

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1656251

Change-Id: I881fe9dd265eddd806730633414a7906b3c3b072