Merge "Add new WifiWake metrics" into pi-dev
am: e7154b6d5a

Change-Id: Ia914a54d287693a3d4e4978a464ea5f12b97b1da