Merge "Transfer the actual dispatcher when the window is preserved" into tm-dev am: a147b66f

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



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