Promotion of wlan-aosp-service.lnx.2.0-00034.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2004013   I2dd5793a432da8972cf15ec097c166491748919f   Serialize scan/p2p-scan if already scheduled on the same
2004013   I3a8a2777b6c56d84e7b055ba70e22641b7a28852   P2P: Override P2P_PEER group_capab with 0 if no matching

Change-Id: I56fffaf34c481b9f1453869352934c37aa922a84
CRs-Fixed: 2004013