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

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

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