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

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

Change-Id: I7030ba9ef47e936f695c9c5eb22a7bf620a7ef5d