Merge "Transfer the actual dispatcher when the window is preserved" into...

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

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



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