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

Change-Id: If13d2a7e8993d93f23082fcd4ccf2732aaacba6f