Merge "Merge "Fix keyboard is attached to wrong task in split" into tm-dev am:...

Merge "Merge "Fix keyboard is attached to wrong task in split" into tm-dev am: 969d1b8e am: 5d846976" into tm-d1-dev-plus-aosp am: 008df30b

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



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