Merge "wifi: Duplicate getValidChannelsForBand in AP iface" am: d8328b6860
am: d1ae25e423

Change-Id: I10268d2fa7fac6e6f55aa34535f60b60eaa0d415