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 am: 7158407c

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



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