Merge "[automerger skipped] Merge "services.net-module-wifi - set...

Merge "[automerger skipped] Merge "services.net-module-wifi - set min_sdk_level to 30" into mainline-prod am: 9dd63c57 -s ours" into sc-dev am: d50796a2 -s ours

am skip reason: Change-Id If0865d7c0bf3164911911ef2a1700bca3d7cc11f with SHA-1 9ea81e9d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a56673d2d2ac3ba4bef169d27ac63a1b1bbabe9