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