Merge "adpf: Use one client token per process for all hint sessions" into...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16938677

Change-Id: Iee1ded57e29e1a4662753e4937cba6e7f79d50da