[automerger skipped] Merge "[DO NOT MERGE] wifi: Reset to default SAP configuration when doing factory reset" into sc-dev am: a96633161e am: 8936db834b -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: I7d8845b832849126de0f27e1614512047fb49200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>