Merge "Annotate @RequiresApi for S to class level" am: d4f017139e am: 7c0777eb47 am: 81691520b0

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

Change-Id: I9df2cb8adc8a7a910b5d893f25d6f34c6b449b54