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

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



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