Merge "Update to the ActivityManager proto"

diff --cc core/java/android/app/ActivityManager.java
Simple merge

diff --cc core/proto/android/server/activitymanagerservice.proto
index 39c5ec7,0649556..55e6a74
--- 1/core/proto/android/server/activitymanagerservice.proto
--- 2/core/proto/android/server/activitymanagerservice.proto
+++ b/core/proto/android/server/activitymanagerservice.proto
@@@ -793,11 -680,9 +794,11 @@@ message ActiveInstrumentationProto 
  
  // Proto definition of com.android.server.am.UidRecord.java
  message UidRecordProto {
 +  option (.android.msg_privacy).dest = DEST_AUTOMATIC;
 +
    optional string hex_hash = 1;
    optional int32 uid = 2;
-   optional .android.app.ProcessState current = 3;
+   optional .android.app.ProcessStateEnum current = 3;
    optional bool ephemeral = 4;
    optional bool fg_services = 5;
    optional bool whilelist = 6;

diff --cc core/proto/android/server/powermanagerservice.proto
Simple merge

diff --cc services/core/java/com/android/server/am/BatteryStatsService.java
Simple merge

diff --cc services/core/java/com/android/server/power/PowerManagerService.java
Simple merge