Merge "follow up aosp/2600007" am: dc8df135cb am: 957d205a59

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

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