Merge "Restrict WifiDppConfiguratorActivity" into 24D1-dev