Merge "Report top resumed state only after previous activity lost it"

diff --cc core/java/android/app/IActivityTaskManager.aidl
Simple merge

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

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

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

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

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