Merge "New API to listen service update" am: 93587f609b am: d6cb8c860e

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

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