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

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



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