Merge "Fix Activity[Task]ManagerService proto dumping code"