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