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: f2230d9e am: 15f93f64

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



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