Merge changes from topic "revert-3535182-EBVRAQTHFS" into main am: 67cc745550

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

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