[automerger skipped] Merge "WiFi: Add configs for SAR support of SoftAP" into pi-dev am: 5d0af8d357
am: 3adf23afbc  -s ours

Change-Id: If9ce7d91627935346400513f0d077f309e9de327