Merge "Add strings for adding a different Wi-Fi Easy Connect entry point"