Merge "Use post-execution state for lifecycle callback sequences"

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

diff --cc core/java/android/app/servertransaction/TransactionExecutor.java
Simple merge

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

diff --cc services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java
Simple merge