Merge "Remove @IgnoreUpTo(Q) annotation and isAtLeastR() check" into main am: 9846b924b8

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

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