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

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

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



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