Merge "RSSI improvement should not re-enable permanently disabled WifiConfigurations" into tm-mainline-prod