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

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

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