Merge "Use SdkLevel.isAtLeastB() instead of SDK_INT" into main am: b453055426 am: db67ad9102

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

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