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

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

Change-Id: Ib984bd23cefc6fadcf750d6aef56f788227b853b