Merge "Prepare for @RequiresApi class retention" into main am: b19fd5414b

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

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