Merge changes from topic "am-827479f2da4c4715bbb9ef845df51d94" into tm-qpr-dev-plus-aosp am: 03b62a0c87 -s ours

am skip reason: Merged-In Ic956b5e52575a467b405fecf142c7f25925358d4 with SHA-1 9e560d24c2 is already in history

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

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