Merge "Remember task which is being locked" into nyc-dev

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

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

diff --cc packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge

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