[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 skip reason: subject contains skip directive

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

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