Merge "Switched ActivityStackSupervisor.mService to ActivityTaskManagerService (8/n)"