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

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



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