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: e199288f am: 39e9d7c2

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



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