Merge "Fix HintManagerServiceTest with mock PackageManager" into main