[automerger skipped] Merge "[DO NOT MERGE] wifi: Reset to default SAP configuration when doing factory reset" into sc-dev am: a96633161e am: da1c2155fa -s ours am: 8e192b7f80 -s ours am: 4be317f21d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id7e4338355f0c1c8056c3358800de06e02a7fd2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>