Merge "Add ANR expiration trace points" into main