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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/15275012

Change-Id: I80162ca82e26fcd813c8c6cd3f2cf52eeafac3f5