Merge "qcacmn: Rewrite util_gen_new_bssid functionality"