Merge changes from topic 'wifi_tx_power_levels' into nyc-dev

* changes:
  Add new wifi tx power levels in Wifi activity energy
  Add new wifi tx power levels in link layer stats