Merge "adpf: Use one client token per process for all hint sessions" into tm-dev