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

Change-Id: Ia12e5aef8c2260a2a3b35da1318ee1a73f6a6728