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

diff --combined services/core/java/com/android/server/am/BatteryStatsService.java
index ffa3b5b,965a9da..3d42047
--- 1/services/core/java/com/android/server/am/BatteryStatsService.java
--- 2/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@@ -1170,8 -1170,7 +1170,8 @@@ public final class BatteryStatsService 
          }
  
          if (useCheckinFormat) {
 -            List<ApplicationInfo> apps = mContext.getPackageManager().getInstalledApplications(0);
 +            List<ApplicationInfo> apps = mContext.getPackageManager().getInstalledApplications(
 +                    PackageManager.MATCH_UNINSTALLED_PACKAGES | PackageManager.MATCH_ALL);
              if (isRealCheckin) {
                  // For a real checkin, first we want to prefer to use the last complete checkin
                  // file if there is one.
@@@ -1224,7 -1223,8 +1224,8 @@@
      // WiFi keeps an accumulated total of stats, unlike Bluetooth.
      // Keep the last WiFi stats so we can compute a delta.
      @GuardedBy("mExternalStatsLock")
-     private WifiActivityEnergyInfo mLastInfo = new WifiActivityEnergyInfo(0, 0, 0, 0, 0, 0);
+     private WifiActivityEnergyInfo mLastInfo =
+             new WifiActivityEnergyInfo(0, 0, 0, new long[]{0}, 0, 0, 0);
  
      @GuardedBy("mExternalStatsLock")
      private WifiActivityEnergyInfo pullWifiEnergyInfoLocked() {