Merge "Merge "WifiManager: Add a note for NETWORK_SETTINGS_RESET behavior" into rvc-dev am: 558351e00a am: c995edc91b" into rvc-d1-dev-plus-aosp am: 3ddc56bc92 am: 4c6128c7ed

Change-Id: I8532d9cfbf32c0dff949a2fb2f5d771b7af7b762