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

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

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