Adding additional wifi power metrics to wifi power metrics

Bug: 116168459
Test: Compared batteryStats with wifi metrics changes
Test: adb shell dumpsys wifi WifiMetricsProto > wMetrics.txt
Test: adb shell dumpsys batterystats > test.txt
Change-Id: I631a677c2731890b120cf6c429f86c6dbb16bd08
1 file changed