Merge "ActivityManagerService: Improve file naming for ANR traces."