Merge "Moved more stuff from ActivityManagerService to ActivityTaskManagerService (9/n)"