Keystore 2.0: Remove references to Keystore1 am: e5f1a100a5

Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/1650857

Change-Id: I604716919bef01244ebcc27e58b969e0b3724085