Merge "wifi.proto: Add metrics for new API surface"