Merge "Fix statsd logging in BatteryStats (nesting prob.)" into pi-dev

diff --cc cmds/statsd/src/atoms.proto
Simple merge

diff --cc core/java/com/android/internal/os/BatteryStatsImpl.java
Simple merge

diff --cc services/core/java/com/android/server/am/BatteryStatsService.java
index 46873d5,2900fbf..b338029
--- 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
@@@ -17,14 -17,11 +17,15 @@@
  package com.android.server.am;
  
  import android.app.ActivityManager;
+ import android.app.job.JobProtoEnums;
  import android.bluetooth.BluetoothActivityEnergyInfo;
 +import android.content.BroadcastReceiver;
  import android.content.Context;
 +import android.content.Intent;
 +import android.content.IntentFilter;
  import android.content.pm.ApplicationInfo;
  import android.content.pm.PackageManager;
 +import android.hardware.usb.UsbManager;
  import android.net.wifi.WifiActivityEnergyInfo;
  import android.os.PowerManager.ServiceType;
  import android.os.PowerSaveState;