Merge "WifiMetrics: Rename MapEntryInt32Int32 to Int32Count"