Merge "Wifi: add 3 new fields to ConnectionCapabilities."