Merge "Add ADPF owners to HintManagerServiceTests" into main