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

Change-Id: Ic9c7283c2c79cf279e0dc4f97a47b57774a43d7a