Merge "Ensure callbacks are run properly on executor" am: 411d2bd07d

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

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