Merge "Refactors common scope id setup code into utility function" am: b94a8eb9ad

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2552792

Change-Id: Icff71fdf35d5deb3935f44ffdd2e4d4e217d1c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>