Merge "Revert^2 "Use timerfd to improve the accuracy of query timing"" into main am: c23d94f2cc

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

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