Set default polling mask and p2p listen mask
am: e6c742033e

Change-Id: I1af9b7c9052221365ff7efe3b8c8e6d991794a65