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: 5d5f6b1c am: 8406eaa1

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



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