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

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



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