Merge changes from topic "revert-3134199-WBGJNFIOKJ" into main am: a41f38a3c0

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

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