Merge "[WIFI][HIDL] Add device-based feature flag support"