Merge "Remove am/wm.proto which is redundant. The naming convention is defined in...

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

diff --cc core/proto/android/os/incident.proto
Simple merge

diff --cc services/core/java/com/android/server/am/ActiveServices.java
index 73b1e33,2ea9530..e84c5f4
--- 1/services/core/java/com/android/server/am/ActiveServices.java
--- 2/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@@ -56,11 -56,8 +56,10 @@@ import com.android.internal.notificatio
  import com.android.internal.os.BatteryStatsImpl;
  import com.android.internal.os.TransferPipe;
  import com.android.internal.util.FastPrintWriter;
 +import com.android.server.AppStateTracker;
 +import com.android.server.LocalServices;
  import com.android.server.am.ActivityManagerService.ItemMatcher;
  import com.android.server.am.ActivityManagerService.NeededUriGrants;
- import com.android.server.am.proto.ActiveServicesProto;
  
  import android.app.ActivityManager;
  import android.app.AppGlobals;

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

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

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

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

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

diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge

diff --cc services/core/java/com/android/server/policy/WindowManagerPolicy.java
Simple merge

diff --cc services/core/java/com/android/server/wm/AppWindowToken.java
Simple merge

diff --cc services/core/java/com/android/server/wm/DisplayContent.java
Simple merge

diff --cc services/core/java/com/android/server/wm/ScreenRotationAnimation.java
Simple merge

diff --cc services/core/java/com/android/server/wm/SurfaceAnimator.java
Simple merge

diff --cc services/core/java/com/android/server/wm/TaskStack.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowContainer.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowState.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowStateAnimator.java
Simple merge