Merge "Revert "[SystemInfo] Replace deprecated native wifi API with wifi-manager...