Merge changes from topic "PerNetworkServiceTypeClient" am: 71c006bd14 am: f8ee14b693

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

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