Merge "[WIFI][TREBLE] Uprev IWifiChip to 1.2"