Merge "Handle S-on-R security types for DPP configurator network IDs" into sc-dev