Merge "Fix memory usage issue on WindowTokenClient" into tm-dev am: 20bb840b...

Merge "Fix memory usage issue on WindowTokenClient" into tm-dev am: 20bb840b am: 1f29cb92 am: 995d09ab

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



Change-Id: I9d0b28f7dd55f6ea96f97719a60c23e65503d1a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>