Ensure callbacks are run properly on executor am: 905273c7dc am: 43838b3eef

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

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