Merge "Use S api in SettingsShim api 31" into sc-dev am: c7e24440fc

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

Change-Id: I0a838bef0317feb543dce454ccfb135fce6e2f6c