Merge "Add ANR annotation to AppExitInfo reason" into tm-dev