Merge "wifi: hidl change to support 11b only mode"