Merge "Fix log spam from ActivityManagerService."