Merge changes from topic "revert-3548747-TOVIIQGWFJ" into main am: 5a3a51eb7a

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

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