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

Change-Id: I044d4eaf0cae72db5b3148816784676ce3c3413a