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

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

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