Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b6 am:...

Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b6 am: 6c9fe5a3 am: 87cbfbff

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475776

Change-Id: Icbec3aa5f645e915bda85c9e37755e7ae60d0331