WifiMetricsTest fixes
am: 4260ae8d7c

Change-Id: I5818b8f8251d02a992bf9ec0e3f90c459105e680