Merge "Converted some AMS log points to use ActivityManagerDebugConfig."