Merge "Search for Vendor HAL HIDL service before AIDL in the Wifi framework." into udc-dev