Merge "Revert "Prepare for @RequiresApi class retention"" into main am: 270f0064f6 am: b19ed49ef1

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

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