Merge "p2p: p2p_go_ht40 won't take effect" into pi-dev am: 0dc477cdcd
am: 6a3bcd02a2

Change-Id: Ibf40ef26ffc149e4bbb4a892a393e260a32137dc