Merge "incidentd: Preparing ActivityManagerService to dump meminfo."