Merge "Keeping only running users recents in memory"

diff --cc services/core/java/com/android/server/am/ActivityManagerService.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/ActivityStarter.java
Simple merge

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

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

diff --cc services/tests/servicestests/AndroidManifest.xml
Simple merge