Merge "Make HintManagerServiceTest presubmit" into main