Merge "Allow wifi p2p to use legacy dedicated address"