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