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

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

Change-Id: I88ce4953adcc24dffe2b4e35f66315ce52ee2fbe