Merge "[WIFI][HIDL] Add device-based feature flag support"
am: 48b4ce2e99

Change-Id: I74d285740511b9e8604a9bac5bcc8ab54688c0d8