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

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

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