Merge "Fix no response after entered split screen" into tm-qpr-dev am: d64db8b5 am: d2b00b70

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



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