[automerger skipped] Merge "Refactors common scope id setup code into utility function" into tm-mainline-prod am: e2d267a4d1 -s ours

am skip reason: Merged-In I5627037c95b5b9cf4af46018bccffb4f16b402a8 with SHA-1 f93a9ddc91 is already in history

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

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