Merge "Keystore 2.0: Add wifi namespace to sepolicy."