Merge "keystore: Move wifi keystore HAL service out"