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

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

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