Merge changes from topic "tc_change_23050307_56" into tm-qpr-dev-plus-aosp am: 34fb8f971f

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

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