Merge "Keystore 2.0 SPI: Add NAMESPACE_WIFI." am: 07f94fbb am: 7e0e17ab am: 424646cb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I063196c2fb7b9547fc24b21a5143bef4fe115df0