Merge "Only send callbacks when overridden" into main am: e1c10b08a2 am: 8c9e96e5eb

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

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