[automerger skipped] Ensure callbacks are run properly on executor am: 905273c7dc am: 43838b3eef am: cfe4765f14 -s ours

am skip reason: Merged-In Icca64511b02dad2f725a2849d2a1e871135b3286 with SHA-1 905273c7dc is already in history

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

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