Merge "Keystore 2.0 SPI: Add NAMESPACE_WIFI." am: 07f94fbb01

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564075

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bfc7b67e43d50c7064d961b7ede3f3a2ad1d7f0