Merge changes from topic "PerNetworkServiceTypeClient" am: 71c006bd14 am: 41fead1d05

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

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