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

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



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