Merge "Fix service found callback on subtype update" into main am: 57ead48b11 am: 441a1b5bf3

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

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