Merge changes from topic "revert-2535219-TAMNEZLAHT" am: f0f83b6fc3

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

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