Merge "Add registerServiceInfoCallback API shim" am: 3b5211804f Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2369213 Change-Id: Ia7022900f17ab7b32388138f92ad732fe0e89827 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>