Keystore 2.0: Remove references to Keystore1 am: e5f1a100a5 am: fb51baf5f6

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

Change-Id: Ie973294c42cb053aa40a60e68da9ca34978b5c6e