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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3005ffbc84c4c6921c154d9ed1ebe2b8866652a