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

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

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