Merge "Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f33 am: 9db72235 am: 3d12f1b9" into nyc-mr2-dev-plus-aosp am: ab8ebeaf"