Merge "Converted more AMS Log calls to use ActivityManagerDebugConfig" into mnc-dev