Merge "Add unit test in WifiDppConfiguratorActivity" into main