Merge "Add anr tracing to AnrTimerService" into main