Merge "Refactor HintManagerService locking to fix race" into 24D1-dev