Merge "Annotate @RequiresApi for S to class level" am: d4f017139e am: 7c0777eb47 am: 05b1a1eca1 am: a6e9cace6b

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

Change-Id: I2bdcb71983d07660bbf4e89fce523acd87b933f7