Merge "Only enable listen-A when there is only DH"
am: 135c543352

Change-Id: I7c379440866b2656a8d9382131fd69f5b7a49edc