Merge "WifiVendorHal: Change the type from long to int for contention time statistis" into sc-dev