[automerger skipped] Merge "wifi: Reset to default SAP configuration when doing factory reset" into tm-d1-dev am: 1e1181e090 -s ours

am skip reason: Merged-In Ia212666450fd9fe3a95393defa2fb56383bab83a with SHA-1 0c3de17f51 is already in history

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

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