Merge "No-op refactoring for suspending callbacks" into main am: aebc6317d3

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

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