Merge changes from topic "revert-2542434-revert-2535219-TAMNEZLAHT-VPTOBCYDEB" am: 700de306ef am: b94412a272

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

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