Merge changes from topic \'wifi_tx_power_levels\' into nyc-dev am: 89d9480
am: af13fd0

* commit 'af13fd06a9fe30cf9fb5b5fd16983d296f8f9138':
  Add new wifi tx power levels in Wifi activity energy
  Add new wifi tx power levels in link layer stats

Change-Id: Ica75ebf4e820364d0457cc5675abae6fe91b70e0