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

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13696182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I032632fafc8a67d61a39a202c5251e51aed95419