Merge changes from topic "s-on-r-network-ids" into sc-dev am: ef5123ded1

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

Change-Id: Ia73e67b16b7ff74391dceb1128131fcd1a6d37dc